gdk: Remove GdkDrawable

It's unused.

diff --git a/docs/reference/gdk/gdk-docs.sgml b/docs/reference/gdk/gdk-docs.sgml
index a4f4d39123139274d29a2cfa1329aefcf948d4f4..c77b8be9020a891112f865692d3440a28e4da79c 100644 (file)
--- a/docs/reference/gdk/gdk-docs.sgml
+++ b/docs/reference/gdk/gdk-docs.sgml
@@ -22,7 +22,6 @@
     <xi:include href="xml/gdkdisplaymanager.xml" />
     <xi:include href="xml/gdkscreen.xml" />
     <xi:include href="xml/regions.xml" />
-    <xi:include href="xml/drawing.xml" />
     <xi:include href="xml/colors.xml" />
     <xi:include href="xml/rgba_colors.xml" />
     <xi:include href="xml/visuals.xml" />

diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index c14b9669dcd80ef53b4e1cd8301bbcaeb1cf8149..7785d0931d9952b269b93b37aee986f52738c83c 100644 (file)
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -274,24 +274,6 @@ gdk_rgba_to_string
 GDK_TYPE_RGBA
 </SECTION>
 
-<SECTION>
-<TITLE>Drawing Primitives</TITLE>
-<FILE>drawing</FILE>
-GdkDrawable
-gdk_drawable_get_visible_region
-
-<SUBSECTION Standard>
-GDK_DRAWABLE
-GDK_DRAWABLE_GET_CLASS
-GDK_TYPE_DRAWABLE
-GDK_IS_DRAWABLE
-GDK_DRAWABLE_CLASS
-GDK_IS_DRAWABLE_CLASS
-
-<SUBSECTION Private>
-GdkDrawableClass
-</SECTION>
-
 <SECTION>
 <TITLE>Visuals</TITLE>
 <FILE>visuals</FILE>

diff --git a/docs/reference/gdk/gdk3.types b/docs/reference/gdk/gdk3.types
index f5889831f983936989da557995414dff671e4e4e..fccac99ebecf40600b098b4b14c3c8598258c819 100644 (file)
--- a/docs/reference/gdk/gdk3.types
+++ b/docs/reference/gdk/gdk3.types
@@ -3,7 +3,6 @@
 gdk_display_get_type
 gdk_display_manager_get_type
 gdk_screen_get_type
-gdk_drawable_get_type
 gdk_window_object_get_type
 gdk_keymap_get_type
 gdk_device_get_type

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 2b2ae6be27899149743a1c73c27809c191bba977..987379bc9ced10f249210f8daa54f002b6d2e8d4 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -71,7 +71,6 @@ gdk_public_h_sources =                                \
        gdkdisplay.h                            \
        gdkdisplaymanager.h                     \
        gdkdnd.h                                \
-       gdkdrawable.h                           \
        gdkevents.h                             \
        gdkinput.h                              \
        gdkkeys.h                               \
@@ -113,7 +112,6 @@ gdk_c_sources =                 \
        gdkdisplay.c            \
        gdkdisplaymanager.c     \
        gdkdnd.c                \
-       gdkdraw.c               \
        gdkevents.c             \
        gdkglobals.c            \
        gdkkeys.c               \

diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index d6dacd0384a8f630b7fac1a062b9cba236af1a28..11501857fa04c1e161cd49e06f2dd47ab9725ca8 100644 (file)
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -154,8 +154,6 @@ gdk_drag_get_selection
 gdk_drag_motion
 gdk_drag_protocol_get_type G_GNUC_CONST
 gdk_drag_status
-gdk_drawable_get_type G_GNUC_CONST
-gdk_drawable_get_visible_region
 gdk_drop_finish
 gdk_drop_reply
 gdk_enable_multidevice

diff --git a/gdk/gdkdraw.c b/gdk/gdkdraw.c
deleted file mode 100644 (file)
index 56a4215..0000000
--- a/gdk/gdkdraw.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#include "config.h"
-
-#include "gdkdrawable.h"
-
-#include "gdkcairo.h"
-#include "gdkinternals.h"
-#include "gdkwindow.h"
-#include "gdkscreen.h"
-#include "gdkpixbuf.h"
-
-#include <pango/pangocairo.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <math.h>
-
-G_DEFINE_ABSTRACT_TYPE (GdkDrawable, gdk_drawable, G_TYPE_OBJECT)
-
-static void
-gdk_drawable_class_init (GdkDrawableClass *klass)
-{
-}
-
-static void
-gdk_drawable_init (GdkDrawable *drawable)
-{
-}
-

diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h
deleted file mode 100644 (file)
index c8d8146..0000000
--- a/gdk/gdkdrawable.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GDK_DRAWABLE_H__
-#define __GDK_DRAWABLE_H__
-
-#include <gdk/gdktypes.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include <cairo.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GdkDrawable      GdkDrawable;
-typedef struct _GdkDrawableClass GdkDrawableClass;
-
-#define GDK_TYPE_DRAWABLE              (gdk_drawable_get_type ())
-#define GDK_DRAWABLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DRAWABLE, GdkDrawable))
-#define GDK_DRAWABLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DRAWABLE, GdkDrawableClass))
-#define GDK_IS_DRAWABLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DRAWABLE))
-#define GDK_IS_DRAWABLE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DRAWABLE))
-#define GDK_DRAWABLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DRAWABLE, GdkDrawableClass))
-
-/**
- * GdkDrawable:
- *
- * An opaque structure representing an object that can be
- * drawn onto.
- */
-struct _GdkDrawable
-{
-  GObject parent_instance;
-};
- 
-struct _GdkDrawableClass 
-{
-  GObjectClass parent_class;
-  
-  /* Padding for future expansion */
-  void         (*_gdk_reserved7)  (void);
-  void         (*_gdk_reserved9)  (void);
-  void         (*_gdk_reserved10) (void);
-  void         (*_gdk_reserved11) (void);
-  void         (*_gdk_reserved12) (void);
-  void         (*_gdk_reserved13) (void);
-  void         (*_gdk_reserved14) (void);
-  void         (*_gdk_reserved15) (void);
-};
-
-GType           gdk_drawable_get_type     (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __GDK_DRAWABLE_H__ */